From a33d2f2920e5da951c8ad6a3a85aaf473574844c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Sun, 2 Mar 2008 10:28:37 +0000 Subject: [PATCH] Applied patch from dmacks@netspace.org closing bug #519796 * configure.ac: * babl/Makefile.am: * tests/Makefile.am: Only -ldl if required, passed automatically via $LIBS svn path=/trunk/; revision=289 --- ChangeLog | 8 ++++++++ babl/Makefile.am | 2 +- configure.ac | 3 +-- tests/Makefile.am | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ebb373..83ccc97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-03-02 Øyvind Kolås + + Applied patch from dmacks@netspace.org closing bug #519796 + * configure.ac: + * babl/Makefile.am: + * tests/Makefile.am: Only -ldl if required, passed automatically via + $LIBS + 2008-02-27 Øyvind Kolås * configure.ac: post release version increment to 0.0.21 diff --git a/babl/Makefile.am b/babl/Makefile.am index 24c3048..41c3602 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -54,5 +54,5 @@ libbabl_@BABL_API_VERSION@_la_LIBADD=\ @LTLIBOBJS@ libbabl_@BABL_API_VERSION@_la_LDFLAGS= \ - ${no_undefined} ${DL_LIB} $(MATH_LIB) \ + ${no_undefined} $(MATH_LIB) \ -version-info $(BABL_LIBRARY_VERSION) diff --git a/configure.ac b/configure.ac index 271824b..fada2b2 100644 --- a/configure.ac +++ b/configure.ac @@ -226,8 +226,7 @@ AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes") dnl =========================================================================== -AC_CHECK_LIB([dl], [dlopen], [DL_LIB="-ldl"]) -AC_SUBST(DL_LIB) +AC_SEARCH_LIBS([dlopen], [dl]) AC_REPLACE_FUNCS(gettimeofday) diff --git a/tests/Makefile.am b/tests/Makefile.am index e289b9d..8e51457 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,7 +26,7 @@ models_SOURCES = models.c AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ - $(DL_LIB) $(MATH_LIB) + $(MATH_LIB) noinst_PROGRAMS = \ introspect \ -- 2.30.2